Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2011 21:17:47 +0000 (14:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2011 21:17:47 +0000 (14:17 -0700)

Trivial merge